Mark all patches as applied upstream for 2018.3

This includes one that was previously considered to be Debian-specific
(moving to Python 3 for tests).

diff --git a/debian/changelog b/debian/changelog
index b24a5423b733b38cf69e3a64a65159b42c67af1e..d24b09e2e8d6a66013c51232a0377e45e671ff5f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 ostree (2018.2-2) UNRELEASED; urgency=medium
 
-  * d/p/{debian/,}Use-Python-3-for-tests.patch:
-    Mark patch as forwarded. It was previously considered
-    Debian-specific, but upstream seem interested.
-  * Mark all other patches as applied upstream for 2018.3
+  * Mark all patches as applied upstream for 2018.3, including one
+    that was previously considered to be Debian-specific (moving to
+    Python 3 for tests)
 
  -- Simon McVittie <smcv@debian.org>  Thu, 22 Feb 2018 22:55:11 +0000
 

diff --git a/debian/patches/Use-Python-3-for-tests.patch b/debian/patches/Use-Python-3-for-tests.patch
index 9a640a13e92f5f6fabcc052892f03a0d54b17d43..a2a23f56e0f0905bbd870e898af3b67f04aa3747 100644 (file)
--- a/debian/patches/Use-Python-3-for-tests.patch
+++ b/debian/patches/Use-Python-3-for-tests.patch
@@ -3,7 +3,11 @@ Date: Wed, 17 Jan 2018 14:07:32 +0000
 Subject: Use Python 3 for tests
 
 Signed-off-by: Simon McVittie <smcv@debian.org>
+Closes: #1463
+Approved by: cgwalters
 Forwarded: https://github.com/ostreedev/ostree/pull/1463
+[smcv: Remove ci/* changes: those files are not in tarball releases]
+Applied-upstream: 2018.3, commit:971265e4e48f2ff512633b27c90569315ff168ff
 ---
  tests/bootloader-entries-crosscheck.py | 2 +-
  tests/test-basic-user-only.sh          | 2 +-